Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 27 Aug 2010 07:07:20 +0000 (07:07 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 27 Aug 2010 07:07:20 +0000 (07:07 +0000)
commit5470a470a1ffe8f6ec5b8934372f87a09e583ae0
treec8ef016cb325e606bb4104dcce924408eed7f449
parentc76830004a747f298c795672be7d197fdfe2fa49
parent61b44e34161c9a468001be35d1a6d6f643ccea41
Merge from mainline.